From: Florian Müllner Date: Mon, 21 Jul 2025 19:36:27 +0000 (+0200) Subject: ci: Install dependencies when using custom destdir X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~116^2^2~41 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6b3bf1b77f1443b14ea580240c75245956413701;p=gnome-shell.git ci: Install dependencies when using custom destdir Commit fd4320156c9 changed the `update-mutter` command inside the toolbox to also install into the sysext extension dir, so people who don't build mutter themselves can still use the sysext tooling. Except they can't, because additional dependencies from mutter's install-common-dependencies.sh script are missing as the script is currently only invoked by the meson-build script. Fix that by also running the script when running install-meson-project with a destdir, as is done from the update-mutter command. Part-of: --- diff --git a/.gitlab-ci/install-meson-project.sh b/.gitlab-ci/install-meson-project.sh index 8afd4079e..61c2fa5f4 100755 --- a/.gitlab-ci/install-meson-project.sh +++ b/.gitlab-ci/install-meson-project.sh @@ -102,6 +102,11 @@ for destdir in "${DESTDIRS[@]}"; do # don't use --destdir when installing to root, # so post-install hooks are run [[ $destdir == / ]] && destdir= + + # also install dependencies when installing to a separate distdir + install_deps=.gitlab-ci/install-common-dependencies.sh + [[ "$destdir" && -x $install_deps ]] && $install_deps --destdir $destdir + sudo meson install -C _build ${destdir:+--destdir=$destdir} done popd